bnc355225 - File chooser crash in Tab completion

2008-06-03  Federico Mena Quintero  <federico@novell.com>

	* gtk/gtkfilechooserentry.c (install_completion_feedback_timer):
	If the user presses Tab while the completion feedback window is
	active, then we'll assert.  Remove the assertion and just re-set
	the timer.  Fixes https://bugzilla.novell.com/show_bug.cgi?id=355225

Signed-off-by: Federico Mena Quintero <federico@novell.com>
svn path=/trunk/; revision=20305

diff --git a/ChangeLog b/ChangeLog
index 70165ae039076f074e8dfa49063241fab186e902..44f8c04eae482e38846adbcb681d982af21a5b80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-03  Federico Mena Quintero  <federico@novell.com>
+
+       * gtk/gtkfilechooserentry.c (install_completion_feedback_timer):
+       If the user presses Tab while the completion feedback window is
+       active, then we'll assert.  Remove the assertion and just re-set
+       the timer.  Fixes https://bugzilla.novell.com/show_bug.cgi?id=355225
+
 2008-06-03  Colin Walters  <walters@redhat.com>
        
        Bug 535303 – add _get_implementation to GtkStatusIcon

diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index aef6d312c81d79cf3c30214971b205c4dc275016..a98041aabd3cc793dc5a89872908aadfff1cf9fe 100644 (file)
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -939,7 +939,8 @@ completion_feedback_timeout_cb (gpointer data)
 static void
 install_completion_feedback_timer (GtkFileChooserEntry *chooser_entry)
 {
-  g_assert (chooser_entry->completion_feedback_timeout_id == 0);
+  if (chooser_entry->completion_feedback_timeout_id != 0)
+    g_source_remove (chooser_entry->completion_feedback_timeout_id);
 
   chooser_entry->completion_feedback_timeout_id = gdk_threads_add_timeout (COMPLETION_FEEDBACK_TIMEOUT_MS,
                                                                           completion_feedback_timeout_cb,